Fixes due @makasim comments