FL-487: Build fixes from Eric Edgar (rocket)