Small fixes

Still dirty.