Make changes suggested by SidekickJS