More Bug fixes for make flags