Various fixes...