Fixes from force commit