Small tickets roundup

See commits