[#298] [#305] Fixed

@Lynngre, please can you double check the fixes.