-Remaining fixes on loans