Softap fixes