[FIX] Small fixes over previous commit