Buka

Resolve application issues