Small fixes from other projects