Final few fixes