Several small fixes from many classes