Some fixes per mark feedback on the 23rd