Fixes several inconsistencies with using prompt functions