general: minor bug fixes