Some small fixes 20130617