Various fixes after new install