Clean up and module compiler flags tweaking