Try to fix few things