Intermediary commit: tweaked addons, build breaks as a result