Smashman's fixes!