staticcheck

Fix staticcheck issues