Fixes small fixes