[#260] Hot fixes

@Lynngre