Fixed build and minor stuff