Fix for ISP setup and applzing new settings