Fix factorization and dynmap patching issuesSigned-off-by: Ross Allan <[email protected]> (commit: 74871fb)