Fix/some minor changes