Various fixes!