Some little general fixes