fixing some fresh setup issues