Fixes from previous commits