- Minor bug fixes