- More minor bug fixes