Feex some bugs