Another batch of small fixes, still waiting