Fixes

Just small fixes