Fixes Small issues