0014: Better handling at load point in mode1 + a bit cleanup