Fixes from other projects