Some minor bug-fixing