minor and majox fix