Fix-ups prior to conversion to Angular