Some cleanup, might fix build