Fixed some issues >_>