Fixed some strange issues