#smaller fixes