Another small fixes..