Bug fixes on Restyler for 3.0 release.

Signed-off-by: Matt White <matthew.white@fclonline.com>