More bug fixes..