Bug fixes based on suggestions by Kees Burger