Fixes for First & Last Name