minior bug fixes