Small fixes. Need to test test test.