Potential bug fixes.