Some fixes after initial testing's