Fixed a couple more issues