Small fixes for new wp form