Fixed some minor issues getting demo site working