Fixed some bugs with the -get command