Some fixes

Got problems, when tried to include to my project.