Small bug fixes on prepends