Fixed compile errors completely