Fix factorization and dynmap patching issues

Signed-off-by: Ross Allan <rallanpcl@gmail.com>