Small fixes / changes
Another fix