Patch 1.0.4 - More bug fixes