Slight fixes on some things