COuple small fixes