More fixes

-I know generic but hacken an slashen...

Change-Id: Iea3fe229920ffb914d34bc6064fee35933b544b9