Fix many dev issues