Some features fix