Fixed issues with keyscheculing.