Few fixes from battlefield