A bunch of patches as commented in rvn's own log