Lotsa fixes