Fix for some issues