Attempted fix at couple of issues