Minor bugfixes - Dev asking more than 1 question