Fixed some bugs with the last release