Various fixes (Non-working build)