Fixin some ticky ticky things