fixing BR #297 and #309 improved default aliases