Extra commands and fixes