Fixed #86: Remove warnings and minor cleanup