Changes: some minor bug-fixing.