More Compilation & Convention updates