Bug fixes 1.0.2