Fixes small issues