Fixes for ICS

At least, they should be...!