FIx some issues