Fixes from review I'll rebase later