Coupl of fixes