Fixes to ASI to just get rid of build warnings