Fix other small details