fixes some mortar issues