Further fixing of noobish mistakes