A couple of fixes for you!