Fix some issues - Compilation