Small fixes
Another fix