Several more fixes!