Bugfix changes - small