Fixed more tiny issues