CoreBase patches from Frederik

[Stefan Bidigaray]

Frederik,
I've seen your patches and issues, but I've been out of town and don't have
access to a computer. I'll take a look as soon as I get back home.