Bug: Fixed two problems with leftover values.