Small fixes, don't remember about what