Misc setup changes