Fixing some forms etc.