Fixes to work with SLES 11