Really fixed build and warnings