Patched up some stuff...