Small fixes in some objects