Minor bug fixes around skill selection