More simple fixes - i shouldn't code before my morning caffeine