Various fixes for little things