Quick fix on some issues