fixes to compile on alec's mac laptop