Just tweaking on some issues reported by my IDE