Some fixes and build stuff..