Minor changes to handler initialize() and static methods