Small bug fixes
merge