Various fixes to support shields