Fixes on Mon May 26 23:21:07 2014