Fixes; minor issue left