Fixed compiler warnings (Jason)