Fixes

@BMartinos some quick fixes