Simleys bug fixes