Fixed some bugs that were introduced in 4.2...