Some fixes for my installation

Yeah. Don't close this.