Cleanups. Small fixes