Small fixes. Need more