Further fixes

Recompiled the project