Fixing up syntax on all current views