Small fixes from Baystation12