Fix some small problemas