Small important fixes