final pre 2014 fixes

Signed-off-by: Chris Jones <chris@jonezy.org>