jeroen Minor cleanups