Minor problems

- Minor problems solved