Fixed some file interface issues