Working on a few fixes