Fix forgotten stuff