Trying to fixing flora bugs