[FIX] Small fixes and more requirements