Just some small fixes.

Just some small and fast fixes.