Small fixes
Remove custom knaaaaaaaaaav