#4 - Fixing minor problems