master more fixes