Fix couple silly bugs :)