Fix some things getting sent to the back-end that shouldn't be...