More small fixes
Lets call this 3.5