*Some bug fixes