Bugfixes with camera ready event