Slight code fixes