Fixed file extension
Fixed more compilation errors