Added a few fixes