Fixed changes after tweaks to interface