3 week small fixes