Cleaned up several warnings, including a buffer
overflow in the DSMF reader