various fixes

- ruben