Fixed bugs from initial files