Cleanup/fixes for gcc packaging