Minor miscellaneous changes for NOOBS v1.3.8