[FIX] small and/or straightforward fixes