EOL fixes, Updated bmake