Fixed some files to compile it on Fedora 20