[#561] More fixes