More camera lib fixes