Fixes for plane and lightning