fix: Fix small issues