Small tweaks for final hosted prototype