Fixes to bring in line with previous app