Various fixes .