bug fixes for generic camera