fixing check warnings/notes...