More minor bug fixes(aka stupid mistakes)