Fixed misc stuff