Ceiling fixes.

Jani Bizjakrequested to merge
jani_bugfixes into master

Merge request reports