Fixing minor problems reported by @mknoszlig