Added couple small fixes